Minor cleanup and simplification

Minor cleanup and simplification
    src/SConscript