Cleaned up SConstruct