Minor changes.
Clean types.