cleaning click event to be cleaner