Changes to more closely match line length limit style