refactor Parameters -> Where