Removing some subterm calls
Refactoring