[nit] Little refactor in Messenger