Fixed up pylint and pep8 errors

Changed naming to be better