Slight updates to formatting