Cleaned up imports and fixed warnings