Cleaned up with pylint