Better syntax and indentation