Remove unnecessary friend
Spacing
Use OptionsScanner
Add OptionsScanner