Minor improvement inline event handlers