small changes towards form submodule with less module-wide variable use