Removed CR comments and added few more