Small style guide fixes