cleaned Term class