Cleaing up the header file