vol2: code cleanup