refacotoring rolled data