Cleanup and minor fixes in commands output