fix a few more style issues