Small changes for style consistency