follow kibit lint suggestions