Run everything through indent -kr then astyle 1tbs. Minor code cleanup.