Clean up / PEP8