Code cleanup

Changed access modifiers