More work at streamlining the command constructor content