small style changes, sync with production hacks