Some cleanup
Made names-info-result into an array