Do the same refactoring as it was done with sendMessage and receiveMessage. See: * ISSUE #66 * PR #80