Refactor partial messages

less duplication