Working on simlifying build script