PEP8, commenting, cleanup