Cleanup and additional member function implementation