Removed old commented code, PEP8 formatting.