Changing access modifiers, and cleaning up