modify code to comply with coding style