[style] use where clause
Merge pull request #213 from nwin/master

[style] use where clause