EX-64(kmeng): More refactoring done in normalize.py.