Part 1.3: Practically accomplished styleguide fixes for minor files