nit: Can you realign the variable declarations?