PEP8 corrections and stylistic changes