Refactor fuel JJB to prepare for Milestone E