a bunch of minor updates to block statements with single statements in them dropping curly brace use where applicable
a bunch of minor updates to block statements with single statements in them dropping curly brace use where applicable

detain/zip-zapper