Fix some import order and code style