cleaned up WebAdom code