Cleaning up content types

Dealt with some inconsistencies