Rename shodowed lifetimes
Use tuple indexing syntax