comment and formatting fixes