Moved member functions outside of headers