Set MODULES_CORE in a single place
Use the python2 pep8