Change version history and cleaning up comments

Change version history and cleaning up comments