corrected pip8 violations
further cleanup