Some cleanup of the Types class