Forms refactor.