Cleaned up dispense command handling

UCC git Repository :: git.ucc.asn.au