First attempt at addressing pep8