small refactor for build compartments