Changed access modifiers and removed unused usings.