volume control cleaned up