Better build script (non-repeating)