Code cleanup is always fun