demo console code cleanup, adding uls commands as well