refactor
additional refactor
Merge branch 'dev'