Minimized some config variables' scope