Coding style change per Hui's comments