Minor syntax cleanup of commented out code