Cleanup

Commented out debug print statements - output is still not to spec