Close #20: Improve console command codes