Address code review nits