Fixed build failure, Also all the feedbacks are addressed. please review