fixed incorrect naming
fixed naming and more pep8cleaning