Coding improvements done

Coding improvements done