Few more linting fixes
Split out Messaging