more style, little code shuffle