Refactor in quorom