z01 and z02 plugin code reformatting