code review and revise bug