Minor cleanup (pep8 and unused code...)