Minor cleanups and formatting