Style modifications. To include in the clean branch