Code cleanup, heh