Refactor forms, use formant