Refactor previous fix for more DRY
NEXT: small Flame Charge buff