clean up unecessary comments and clarify others
Comment and refactor class