Map array or object to array improvement