Tidy up Sconstruct build script