Format and optimisation of imports