architectural refinements