Improve doc & fix import ordering

No match.