Tidy Data set as required