Remove explicit types for some local variables