Updated Comments

Updated comments and comment format