Cleaned up comments and resolved final pylint violations