light refactoring of the Term class hierarchy