Some serious type tidying