Style updates for issues found while testing