Refactor coding style