style changes from geoffrey