Syntax and indent tweaks