Close #10 by making sure that named references do not appear with a leading underscore
Tweak spec expected output to match fix for issue #9
Added cleaning up code for more examples