code cleanup after adding volume control