Minor refactoring of CTT