some comments after code review