Cleaned up ClassNode