Refactoring Code

Signed-off-by: ano1rest <ano1rest>
Merge branch 'develop'