More PEP8 compliance. I'll be renaming packages soon to make it easier to fit under the char limit.