Clean up imports, use angle bracket style