more style guide fixes