pep8 and remove the if statemenet