Fix syntax and ordering