* Code cleanup.