Console help refactoring

Fixes #4535
would be good to finish discussion first before changing the code :)