Fix syntax, regroup lines