Clean-up and term description stream-lining