Update syntax, naming and spacing