Clean up syntax slightly