Minor style fixes as per @tomchristie's code review