Clean up
Shorten class name
Fix node value updates