Improve code readability
Add some const where applicable
Implement console command completion