Minor changes

 * Optimizing Build script