Cleanup and fix initial argument naivete