some code review comments added