Clean up Terms controller

Fixes #650, #607