Formatting a la master branch