removed all changes due to author request to leave tabs and pep8 issues alone and then added back in the 2 functional changes