code cleanup - member function names