Move variable initialization for clarity.

this is a follow-up for #1188

@h-kataria : please, review

thx!