Improve usage of which and that