Minor changes for accuracy and style