More code location refactoring