minor changes, simplify style