Add missing % and comment unused variables