minor code cleanup, need to implement the node/glob on files next