one last cleanup fix .cpp and .h