Refactoring. Use helpers