require() fix; cosmetic cleanup