BuildingCapture cleanup

* StyleCop
* redundancy