Simplify Build Process