Style
Datas to data
Fix shifting not being applied
Restore tests
Allow punctuation to be included