ok, i didnt want to redo it all. but tried cleaning up some of the lines