code review API refactored
removing the customized dependency