Cleaner command-to-function mapping