cleaned up command invocations