Fix unruly syntax