Refactor/tweaks to messages