code clean-up and first import