Tidied up JZBAnalysis code