Added relevant pep8 codes