Clean up minor things
Clean up term order functions
Clean up normalForm
Clean up combineTerms
Fix normalize function