Sorted issues with header file