Clean up config/cli arg parsing and defaults