some codding style improvement