Update some syntax & conventions