Add missing starts_with_acronym modifiers. Some small refactorings