code review done, comments were added