Clean up (pep8 + others).