Code reformat with suggested indents per http://www.refactorcop.com