Use predefined classification types.
Clean up and simplify.