small changes due to coding guideline