- Code cleanup.