Addressed comments, ran through pylint