form_refactoring

Signed-off-by: Andrey Maralin <a.a.maralin@gmail.com>