Eliminated hard-coding of building names; now data-driven
Modified to use data-driven (non-hard-coded) url patterns