Refactored event handlers, now we are using delegates instead of ActionListener class