Formatting/cleanup

- no need to use ':execute' on literal strings
- use consistent casing in mappings
- use the full form of some commands and options, for readability
- indentation