Refs #2 - Pep8 pass.