Simplify interrupt logic