A few style changes - not nearly done