Refactors Condition module so that Nodes do not have to worry about a type