Minor tweaks
Removed unused use statements