Remove unused code
Add a term suggestion dialog
Formatting fix