comment/style cleanup