pep8 & delete unnecessary