Updated comments the look of the classes