Code clean-ups w/ pylint pep8