More PEP8 formatting and some cleaning