refactor - ok