Organize imports and fix warnings