Mod: code cleanup