some refactoring and beginings of labels for fields