Code clean up (Pep8, pylint, unused imports, etc.)