Refactor and add airline glossary