PEP8 Comforming

Not sure if I like it yet.