Tighten access levels to package-protected where possible