some pep 8 and code removal