refactor header partly