Code cleaned up with help from pep8 & pylint