cleanup .h and .cpp