cleaned up message types