Improved style to meet pep8