Pep8 fixes and settings name fix.