code refactoring for standardization of coding style