Apply code review comments