cleaned up type noise