Removing unused imports, bringing comments into PEP8 style