Cleanup syntax slightly