Sushil

Re factored the code