Minor changes to access modifilers