minor tweaks

Signed-off-by: Arvind Chembarpu <achembarpu@gmail.com>
minor tweaks

Signed-off-by: Arvind Chembarpu <achembarpu@gmail.com>
refactored vars and fixed formatting

Signed-off-by: Arvind Chembarpu <achembarpu@gmail.com>