remove some fluff, add more fluff