Cleanup: removed superfluous variables originally used to reconstruct Z shape the second time; also adapted CB convoluted with a gaussian