Lots of whitespace changes to accomodate pep8 formatting