Minor fix and coding style update.