_handleClick clean up