refactored the event handlers by by joining related methods together
refactored the event handlers by by joining related methods together