Refactoring of node form classes