Cleanups, 80-char limit