Removed some comments and added