Fixes to class. Protected methods to private.