Fix code review feedback from @TimLovellSmith