Some more refactoring on 110307.cpp