Hide configuration behind accessor methods
Remove duplicate menu item
Use delegation