Changes in comments and update class name