Fix CatBlock link on Safari, clean-up code