Adding comments into the class. Also clean-up the format.