Change access modifiers to private or final where trivially possible