Cleanup

Fixed long lines and stuff
A little more cleanup