Made data_message code more readable
Changed callback signature for session_message