MOD: Code cleanup.