Part 5.5: Styleguide fixes