Tidying up type system