some cleaning and re ordering