Refactor Quest design