Cleanup formatting & document the 'nonsystem' flag