Clean up, renamed media_type to category (makes sense)