Update syntax to meet guidelines