Formatting fixes (ran the autoformatter), and changed some access modifiers to match the assignment documentation
Changed access modifiers to match documentation