Code refactor

Updating ViewHolder