I refactor it to look at cases with limit or no limit. I think it's clearer logically.