Added comments for classes and final changes for markups