[1663] Improved importing and formatting