changes to riot data handling
Merge branch 'refactor'
technical debt: zero