1) Added conditionals around node structure, giving clean nodes for either