slight cleanup of cafe code away from using server_message
Merge pull request #30 from chuanshi/cafe-fix

slight cleanup of cafe code away from using server_message