fix spacing, switch to cmd.retcode