PEP8, unused imports, unused variables etc

Bug-Url: #2