Code cleanup, I guess