Tidy up and unnest some functions
Support intl as a key for messages in addition to messages
Version 1.1.0