Removed error handling and cleaned up template
Removed commandswithdefaults method