refactored labelling form builder to make clear which methods are public and which private