some style guide fixes

Some adjustments after discussions \o/