Removed unused parameter
Better header structure