Added code and tests for the Node classes retrieve method along with a few minor clean-ups.