style cleanup, correct some comments