Code cleaned up with Pylint