address code review: less code