Refactored notice and nick processing