More syntax clean up