Update hpx transform and some cosmetic changes