More syntax tidy