Clean up Terms controller

See #650