removing type that isnt really needed
Merge branch 'demo-refact'