Re-indenting per style guide. It's déjà vu all over again