Refactored header file