updates for neater fomratting