Code cleanup again.