Move mkdir to build script
Removed syntax issue and normalized conditional
Minor adjustments for CDE style