(Core) Code cleaning.