Minor refactoring: separated class
Merge branch 'master' of https://github.com/Some1Nebo/MultiFive.git