Небольшой рефакторинг кода.
Merge branch 'refactoring' into develop
Merge branch 'develop'