Fixing style issues