Light review & refactor.

Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>