Tidy up
Merge pull request #1414 from Cinderella-Man/1.3.0-tidy-up

[1.3.0] where() method tidy up