Do some cleanup of the code

[ulrikstrid]

The code is messy right now as it started as a hack as I was tired of waiting for that extra node startup while trying to iterate fast on another project.

[ulrikstrid]

Drup and companion_cube told me that Set or Map are probably better representations than Hashtbl