refactored content server block