Cleaning up header file