diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0d20b64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/schema/SConscript b/schema/SConscript
index cd775c2..0bdaaca 100644
--- a/schema/SConscript
+++ b/schema/SConscript
@@ -20,32 +20,35 @@ if env['CC'] == 'gcc':
 
 env['CCFLAGS'].append(env['CPPDEFPREFIX'] + 'RAPIDJSON_NAMESPACE=contrail_rapidjson')
 
+def get_sources(targets):
+    return [x for x in targets if re.match(r'(.*)\.cc$', x.abspath)]
+
 targets = env.IFMapAutogen('vnc_cfg.xsd')
-lib_srcs = filter(lambda x: re.match(r'(.*)\.cc$', x.abspath), targets)
+lib_srcs = get_sources(targets)
 lib = env.Library('ifmap_vnc', lib_srcs)
 
 targets = env.IFMapAutogen('bgp_schema.xsd')
-lib_srcs = filter(lambda x: re.match(r'(.*)\.cc$', x.abspath), targets)
+lib_srcs = get_sources(targets)
 lib = env.Library('bgp_schema', lib_srcs)
 
 targets = env.TypeAutogen('xmpp_unicast.xsd')
-lib_srcs = filter(lambda x: re.match(r'(.*)\.cc$', x.abspath), targets)
+lib_srcs = get_sources(targets)
 lib = env.Library('xmpp_unicast', lib_srcs)
 
 targets = env.TypeAutogen('xmpp_multicast.xsd')
-lib_srcs = filter(lambda x: re.match(r'(.*)\.cc$', x.abspath), targets)
+lib_srcs = get_sources(targets)
 lib = env.Library('xmpp_multicast', lib_srcs)
 
 targets = env.TypeAutogen('xmpp_mvpn.xsd')
-lib_srcs = filter(lambda x: re.match(r'(.*)\.cc$', x.abspath), targets)
+lib_srcs = get_sources(targets)
 lib = env.Library('xmpp_mvpn', lib_srcs)
 
 targets = env.TypeAutogen('xmpp_enet.xsd')
-lib_srcs = filter(lambda x: re.match(r'(.*)\.cc$', x.abspath), targets)
+lib_srcs = get_sources(targets)
 lib = env.Library('xmpp_enet', lib_srcs)
 
 targets = env.TypeAutogen('services.xsd')
-lib_srcs = filter(lambda x: re.match(r'(.*)\.cc$', x.abspath), targets)
+lib_srcs = get_sources(targets)
 lib = env.Library('services', lib_srcs)
 
 env.SConscript('test/SConscript', exports='BuildEnv', duplicate = 0)
diff --git a/schema/test/SConscript b/schema/test/SConscript
index 7631358..b601119 100644
--- a/schema/test/SConscript
+++ b/schema/test/SConscript
@@ -43,7 +43,7 @@ env.Append(CPPPATH = [env['TOP']])
 
 def CCMapTest(env, testname):
     targets = env.IFMapAutogen(testname + '.xsd')
-    cc_files = filter(lambda x: re.match(r'(.*)\.cc$', x.abspath), targets)
+    cc_files = [x for x in targets if re.match(r'(.*)\.cc$', x.abspath)]
     cc_files.append(File(testname + '_test.cc'))
     test = env.Program(testname,  cc_files)
     return test