Cleanup: make form-view code a bit clearer