Applied code review comments.