Cleaning up syntax