Make code pep8 friendly