Mod: Cleaned definitions.