Cleaned up the console command