cleaned up .h and .cpp files