Fix some of the text to comply with the guidelines