Removed trailing white space, added some pep8 fixes.