Improve doc, satisfy lint requirements