header file added and cleanup in it