code review done, add return code