Cosmetic fixes
Parse simple repetitions