PEP8/Pylint fixes

Please try to follow PEP8 and Pylint advice to keep code as standard and easy to contribute to as possible :)