Refactoring.

Signed-off-by: udaykar.startup <udaykar.startup@gmail.com>