refactor

[ticket: #X]