Kdrefactor

`== 0` could be ommitted