Small code sugar refactoring