modify codes for coding convention