[#353] Changes based on code review.