Cleaned up output
Converted node storage to map of ID to function