made a few more style changes