Cleanup types.rs