COSMETIC: Code cleanup.