more equation cleanup
Merge pull request #2 from shepazu/master

more equation cleanup