Part 5.6: More styleguide fixes