Little cleanup (pep8 etc.)