Minor syntax refactoring