Update imports to 1.8+ style, formatting fixes