Cleaned up chat service class