Clean up type signatures