Remove comments and few changes