Update header file and clean up