Style fixes as per Reynold's review