Small part of refactoring