Better node organization