Add ViewHolder and little cleanup