Import of the code clean-up