PEP8/PyFlakes cleanup (line length, spacing, etc)