a few more slight style changes