fix import order and clean code