Various tidy up of type.less