PEP 8, general cleanup