Code cleanup and pep8 compliant.