refactoring to adhere to Pep-8