more clean-up of 'where'