Clean up a bit in users command