code review suggestions taken into account