Code cleanup based on pylint feedback