A little refactoring
Status command