Minor changes to formatting and strings