Tidied up typesigs