Updated syntax

and fixed pretty print