Added more comments and todos as per code review feedback