Refactoring: replace explicit type arguments with <>