Refactor decision generation