simplify content types
psr-2 names