minor buildscript refactor