Re-arrange variable definition

Signed-off-by: Harshavardhana <harsha@harshavardhana.net>