Minor refactoring of local names
Extra refactoring