refactored content