Housekeeping: No more underscore notation for private methods