Cleanups to whip back into shape