JQ: Refactored