refactor more forms