Code Refactor

Signed-off-by: Harsh Gupta <gupta.harsh96@gmail.com>