Some refactoring of ToS default template