Finetuning some recommended coding style