Improve doc & fix import ordering