Fix whitespace
Add wrapper to commands to allow for deferred sending