Cleanup of header file