Minor changes to make config easier to understand