[HK] Tidy up script