a little more style cleanup