rearranging; cosmetic changes