fixes for tito for pep8 and using one variable