Update some syntax for better conventions