Closer conformation to PyLint and PEP8 standards

Not 100% conforming as it would require significant refactoring of the code.

Code as it stands is more readable and more closely conforms to PyLint and PEP8 standards.