minor coding style tuning.