form refactors