Refactor - Header module