Refactored header file again