Resolves first wave of comments.
pep8