refactoring: reduced complexity in labelling form builder