extract xtends utility an make change to demo code