Messages received
Small refactor