Generic cleanup and indentation and pep8 and pyflakes