Deleted some comments related to debugging and added some comments for Todo