Make utils imports a bit cleaner