Adding CSV sample
Code clean up