Tidy features, add content type to docstrings