Some minor cleaning up with regards to Core::UserMessageWidget.