fix and code review