Cleanup imports and header comments