content_type refactoring