style and comment changes