Cleaner code for new intersection handling