Updated comments in the class