improved naming conventions
fixed a couple of pep8 issues