Cleaning code

It needed it! Next thing to do is to get rid of the code of implementing
the nodes ans start to integrate classes to do that.