Simplify node logic
Merge pull request #243 from JayXon/simplify_node_logic

Simplify node logic