Messaging

Cleaned up few functions.