Slight syntax refactoring