Switched to using `for` sugar