Stylistic changes and slightly higher mutation coverage