Rewrite to be more in the style of the lisp syntax