Numerous style normalizations from John: