Simplification of the type system