Adding abbreviations only when they're needed
Abbreviations should be buffer only