Refactoring for coding style