Refactor nodefields.