Some rewording and reformat