Adds total time, pep8 fixes