Untabify

Minor cleanups.