Commands formatting
When at top level ( mapping now works correctly