Clean up some env var parsing