Form: clarity refactor, more tests, docs