v3 tweaks: update STYLEGUIDE, minor code style fix