Code clean up (pep8/pylint)