Updating contributors
Tidy-up imports and formatting
Clear a couple of warnings