refactor for cleanup of enterprise