Minor tidy to bring code in line with WWX talk