Move extract_content into its own class