Refactor bind event handlers