Re-factoring ..

Signed-off-by: Harshavardhana <harsha@meld.mn>