formatting, and comment chnages