Re-styled a previous pull request slightly.