cleaning things up, getting rid of redundant terms, etc