Fixes for pep8 feedback