Replace which with type; encapsulate in func to express intent
Update several program configurations