Minor refactoring in content sample