Pull OnClickListeners into Listeners class
Remove dead code
Create NodeMap class, pull logic into it