A little cleanup
WIP: working on tuple conversion. (re: issue #10)