Some refactoring and cleanup in ttRegistrator class.