Code cleanup, again