PEP-8 formatting, remove stale TODO comment