Refactoring: using shorter names