PFN_ISR is no longer used.  Remove it.
Rewrite for consistent coding style.