Refactored notation