Consistent formatting as per feedback from @ivarne