Refactor fetch button click