Commented code and changed access modifiers