tidy up imports and rename the node-independent functor application