Clean up imports and spacing, bump to 3.6.10