a few syntactical updates for consistency