more minor refactorings
Merge pull request #2 from jamesoram/exp

more minor refactorings