address code review comments 01