Apply Yury's formatting fixes - thanks!