Code cleanup, fool