Further changes to formatting