Code cleanup, better, faster, more sparkles.