Removed unused and changed the comments