Style consistency fixes for PR #6