Fix white space, pep8, and address @kwmsmith's comments.