Mainly PEP8 stuff.