refactoring -  ok