Minor fixes for code style consistency