Cleaner messaging code