Remove unused imports
Tweak naming
Update headers