Refactored content