Stylistic improvements to 07s