Fix inconsistent code style from latest merge