Fixing style guide issues