Make encapsulation of CommandBox a bit better. Add back the 'blank line' at the end of script bodies