Clean up debug spew, move to environment variables or arguments. Precursor to a refactor to make this a binary