#27 refactoring init form