Tweaking formatting from merge request.