Code cleanup, PEP8, readability.