Clean up how config variables are handled