logic cleanup, make public resource defs central for constructing public resources