Shortened singatures by factoring out types
Reworking types