Code style chnages