Took out all of the pep8 violations except line too longs