Update syntax to use properties and dot notation + small fix here and there