Code cleanup

Nothing major.  Just a little less indenting; I think it's more readable now.