Slight changes to formatting