more style/format changes