Improved code style
Added console command
Added console command