Refactor header partial location