some refactoring
Merge branch 'feature/playintegration' of git@github.com:jack10/shiny-octopus.git into feature/playintegration
refactoring