[no-task]: some refactoring