big code refactor for OTUs and Community