Refactoring in progress...
Node class refactoring
Refactoring of Edge class