fixed items per code review