Fix imports and improve formatting