sligth refactoring