Slight changes to comments and formatting