Cleaned up a touch

Moved the Node back into the class, and cleaned up the template
references