refactoring interface ok 4/24