Resolve ISO Builder Fixes

Implement the original recommendations that are still present in the current codebase. Source: #7 (comment 2593583)

Note: references linked in the original spike issue are out of date. The files moved around a lot during the code reorganization.