Updated comments and did some general cleaning

Comments
Cleaning