more style nitpicks