incorporated code review suggestions