small tweaks, consistency