Removed old comment, PEP-8 cleanups