HV-912 Reducing accessibility of some classes and methods