refactor: use more ramdba helpers