(maint) Doc and style improvements