don't expand rootNode + cosmetic changes