formatting and commenting changes