Fix pep8 problems and remove unnecessary dictionary