Make some more classes/methods non-public