refactoring: don't use legacy notation again