Removed unused imports and order imports
Generalise use of the table columns
Remove warning
Ignore .settings