Light cleanups in the system module

There should be no whitespace after/before {/}