some changes for coding style