code cleaning: fixing names and access modifiers