[UP-4149] Updates based on code review comments.