require() fixes; cosmetic cleanup