even more style changes / code fixes