Reordering settings to use env vars