Cleaned up files, some PEP8, unused imports, docstrings, etc.