Make pylint more happy and make vrsent pep8 compliant