Cleaned Code after being stood up by Pylint