better style?
trivial changes