refactored to use formulas for all components, cleaned up pillar files