Refactor: Simplified term form code