Refactorized some variable names and click event.