Get rid of all thse braces for one-liners please.