Abbreviation lookup
Refactor