formatting and comment changes