Code formatted after latest pull request.