Merge "Tidy ups from prior code reviews"