Cleanup

Cleanup and identified bug with tuples (in QuickTest)