Further changes to fomatting