Moved member function definitions to *.cpp