formatting tweaks
short circuit tweaks
configuration tweaks