Refactor gross number click handler