Cleaned up command