Reduced the number of member functions.