Move env var section to end