Fix not working, and refactor

:(
Useless assignment to variable - `ri_util`.