Few code updates

Some updated code