Bug 3098 follow-up: Clean up formatting