Build Script: Simplify Logic