Minor fix & reorganisation