Making some changes as per code review.

Still to make changes to PIN table