Eliminated some comments