Localized variable names, removed config.