Toward a cleaner version for Axelle Baroni. Scons OK and cleaner style.