Better syntax and names